Several fixes and improved instructions.