Cleaned up, added some extras

Ready to submit