minor changes / fixes to last commit