Misc changes, much fun.