Front end/a few fixes