Fix bugs and added description on options and commands