and more fixes... :)