minor fixes, getting ready to add collision