Added nucleotide output, minor changes + bugfixes