fixing bugs
progress