Additional corrections. Mostly in building the frontend