many bugfixes and little graphic improvements