Fixed some features and stuff