* Rebase with main, update license headers * Small PR cleanups * One last small PR cleanup * Syntactical sugar * Updated error handling * Spelling mistake Signed-off-by: Dan Cunningham <dan@digitaldan.com>