Added time management, and corrected physics issues