minor fixes, ready to merge to master