some tiny fixes from comments