virgo improvement stuff
Merge branch 'development' into liamvirgo
virgo improvements