little here and there changes