final problems fixed