Yet again some server side updates and some minor updates