Servlet refactored
Drive ramping fixed