more changes toward WPF application, looking almost good now