Updated stuff. Feel free to try it!

Graemme mostly