Cleaned up code related to /setnext and worked on objectives