Chris3

Here are a few more patches. Cheers.