All mods and maps working; more lint and cleanup