All sorts of small feature changes / tests
Minor style updates
ACTUAL style changes