Buff cannons more: decrease production time 375->250.
Check deeper for map-mods
Fix some log spam
Merge branch 'newbugfixes' into 3.1