Updated javadocs, finalised autodiscovery and code cleanup