major improvements, endpoints, handlers