Improvements for Happeo

< Happeo