updates, clean up
corrections on logic, lol