clean up some code, add in some objects for ease of use.