added more logging to pre-validation, small naming changes in proxy