More work for #35!
-Also some really minor uber tweaks