angles added, bounds still need fixes