More cleanup, readme update