a few fixes to the last commit