fix file and method naming
fix var naming, display server errors