Merge pull request #136 from SaveTheRbtz/master

Recovery: improvements, bugfixes and type removal cleanups