Added/updated JavaDoc

Also tidied up some naming and defaults.