Fixes and improvements
Cleanup
Add server tasks