fixed first 10 bugs from inna