Front end completion

Some final front end changes