Adding in some of Joe's feedback
Adding some further tweaks from Joe and arthurvr