Add in Namalsk and a few fixes