*/CHANGED Bugfixes and done a lot of testing. Almost ready for the merge.