Minor fixes.
Added more options to OptionScreen to match the server side: IP,Port,Method,depth
Minor refactoring.