Spacing issues
Fixed update bug
Merge pull request #38 from ucberkeley/bugFixes

Don't merge unless description says otherwise. General bug fixes