Added more options, need to fix description for new flags