some work on general stuff
Merge commit '8cbb89c82315b3f7999b62d3eea75f6eeb4e59b0'