Fix instructions and display nicer