update default program
update collision detection
nits and fixes
tabs