forget to apply all the changes in the last commits... see last few commit messages for descriptions