some updates
some more fixes