Bug fixes

Follow new format, otherwise it caused undesired effects and some typo changes.