Added genotype aligner step + Other minor changes