Lost count..Several changes and bugfixes.