minor updates to allow for less code changes for different environments