errors moved to client and router rules refactored
merging changes