Maxw opts

Changes to improve startup performance. Comments in the commits.