minor changes, preparing infrastructure