updates to master conf