Bugfixes + severe improvments