Added a few items, cleaned up some code