some fixes
fix standards checks