fixed stuff
Merge remote-tracking branch 'pyropeter/sml' into sml