Extra Flexible Front sources. Some fixes/renames.