finished mazuelas and fixed some convention things
merged