100% working (-:
some more bugfixes