Compare commits

...
A pull request between these branches already exists: public/website#33

clean up a bunch of small issues #33