finished most of the initial changes