updated some missing static flags and minor tweaks