Adding logs, making tweaks to order of ops to correct things