Fix some details and update README