Again a lot of improvements, getting ready for version 2.0.0.