6 major Bug fixes