More work on physics stuff; integrated some collision code from an older game of mine