a few fixes
format