fixed errors/warnings