Added NBT-saving for pusher/pullers and cleaned up code.