angles solved,almost done