minor fixes and beauty updates