initial integration of front-end fixes