Misc tweaks, added automod
missed file