updates based on PR feedback; Work on #53