* fixes here and there