Cleanups

mostly the last structural changes within the frontend before RC1
also added minor fixes found during the cleanup