Latest core gem & pt_commands tidying