Minor cleanup, move debug cruft to extra file
README update