fixed the remaining bugs, for me it works like a charm :)