Update instructions and some small clean up