various litle improvements