Add some features and remove shit