Lots of changes and refinements to the alpha front end...