improved angle enumeration