Fex fixes to the homeshield & refactor