some fixes docs/srv will soon be added