Update latest changes from Sef and my commits

Dglance restapi