Updates

Took away some things, added some needed functionality