fixed errors from pull