Added new features, reworked old features