Added nuc/prot modes, minor bugfixes