player collision added, code cleanup, more enemies