updates to fix design issues and fix mocs