Fix up readme and clean up env