More collision / enemy tweaks