Tidied up some code / Added notes to default values to document what options will be possible