BUG FIXES & OTHER CHANGES: