minor changes, more clean up later
need to break out adde stuff into seperate project to prevent dependency creep