updated to newest and did some bugfixes