cosmetical changes, bugfixes (now it works)