updating for better collision detection and some screen captures