General Bug Fixes and Mac Update