formatting fixes
remove debug warning; add shift to catch small round-off issues; = spacing