updated and removed bugs