some updates

fixed several issues