Cleaned up a bit, and added some additional goodies