fixed some terribleness
Lots of small fixes.