Front end

bug fixes