some more fixes & 'improvements'