add more options
update readme and cleanup