fix maintenance
few fixes