fix problems from feedback