updated classes and bounce function. Cleanup in code. eliminated loc.1.
Added other things