Bug fixes
Formatting