Added some comments and deleted proxy option