some more changes and fixes