*/CHANGED Bugfixes. Ready for merge now.