Adding variants, Smaller bugfixes