Added client limits
Minor changes

Cleaned up deps and logging a bit