Finished most logical/mechanical updates