Dev

Merge corrections from dev.