added https/ssl support, removed excess
removed unused method
removed plural from enum