further modifications to likelihood calculations

committing mainly due to computer troubles so that I don't loose anything