Some Bugfixes. Still not working...