other stuff for 1.5.8.

will merge myself