ops, fix errors introduced by last commit. forgot to stage a few changes and also to run the tests locally..