Update comments
Add overwrite option and tests