Overlooked putting hover test code in
adding trim checks and tidying a little