tweaked stuff, fixes #32