Fix cache cleanup
Exit gracefully if no file name given
Better option string processing