cleanups + fix areacollide