final changes, ready for single node deployment