Add help and integrate changes from testing