More updates

Clean up code. Fix comments. Test collision table. Problem with
collision table is it's not indexing.