updated
some more changes and fixes