minor bug fixes after first check by OF