Hopefully better logic for blockphyics and a few other minor changes