minor fixes, add Derek's version