General Improvements

cleaned up code
fixed methods
removed deprecated items