Worked on performance, tests, other small things
Merge branch 'master' of github.com:moowiz/ucb-codereview