recovery boot loop fix and build fix, cleanup