a few more exercises and tweaks