alot of changes & bugfixes