better document options + short options
add TODO