dev/script-fixes

Some minor fixes and a rework of formfiller.sh for cleaner profile support.