Fresh Install Bug fixes

Prevent actions that require directory to be populated until it has
Get rid  of Break/Continue Bug