core plugins cleaned&fixed