Program flow fixes
Update libs