More cleanup, filling out README