Bugs fixed Sep 2