tiny changes (forgot some on previous commit)