printf fixes
cleanup