cleanup, tiny fixes and changes