Fixed plot
Added angle
Several corrections