fixing bugs + adding changed