Merge pull request #157 from SaveTheRbtz/master

Recovery: monitor fixes and usability improvements