fixes in front end