minor changes and tests, to the surprise of no one, something is wrong with twitter bootstrap and I'm too lazy to fix it currently