Bug fixes + security checks complete