Cleanup of some angular variables, fixed typo in list