Fixed collision bugs and added functionality for pushing objects