updated and cleaned up
removed silly mistakes