code polishing progress
Merge branch 'dev' of https://github.com/brainsonfire/brainsonfire_website into dev