some minor improvements here and there (I believe).