Fixes #46 #47 #48 by adding / fixing all listed enumerations in discovery_method

As listed in #46