fixing bugs from pull