more changes and fixes