[MOD] fixing some things