adding a few additional output fields
fixing a severe angular vectoring bug