some small updates per code reviews