Fixed bugs from merge, save leftover command data