+bug fixes, front end