Mairin

fixing stuff because git makes no sense to me