Bug fixes and instructions update