"Misc Changes. TODO: remove physics"