Tidy ups and minor function changes

removed module as conflicts with other content..