bug fixes in gui and controllers