some fixes
formatting