some fixes :)