PRs ready for review _

Clean up for with lib (needs to be merged)