Master Branch fixes plus New Reload Client