consolidated some more build settings