Fixes, updates for server changes, removed un-used variables and removed literal strings (replaced with string resources). More to come.