little fixes here and there. terrible commit comment, I know