many small fixes... :)