Added some extra examples
Removed NOPASSWORD option