PR feedback + minor fixes