Added further similarity methods and bugfixes