some lil fixes here and there