Various Updates - inlcudes more code cleanup