some litle fixes, no global changes