Several fixes and better instructions for user