Add standardization
 * Correct simulation issues
 * Add standardization
 * Minor menu change