Pull in num_angles from config
Minor updates