Further improvements to frontend.