Server fixes, add commands