Improve and update setup instructions (small changes)