3.2.1.0

Minor tweaks and such