Bunch of new/removed features

added some and removed some