mostly clean up easer update code that was a major pain to my brain