Did more on collision detection and fixed bounce and constructor