fs: TO BE SQUASHED

corrections from review. will be squashed to previous commit when
complete.