some fixes .. :-D