ready to pull and made minor cleanup changes
merged conflicts