Language fixes

Goes some way to fixing #25, and fix other small things.