settings server

Plus other fixes