wait option

add command-line variable to skip waiting periods
update to match changes to CF