Commends and cleanups, about to add websockets