Holo improvements

Doing as pull request to gather comments first.