cleaned up

Cleaned up and added some features