more changes to try and fix bugs -- about to work on other machine