More cleanup + some README stuff