fix final problems