cleaned up excess code, got variable values moving around