Updated some features and stopped some bugs