formatting, add new waituntil grammar, rewrite waitfor grammar, simplify waitfor build-routines to match new grammar