tiny fixes and cleanup