Some new features + refactored physics