Bugfixs and Lists improved