Further static cleanups

general fixes to make working with the front end more manageable.