Various changes, getting ready for first stable release.
After the 1.7 official update more changes will be required.