Update Options, Clean Up, Documentation