few more changes (some work in progress)