* some fixes right after some fixes :)