fixed errors, warnings...