Bugfixes and pratly rework. The funtionality to the last revision did not change, except that it is working now.