fixes #1214 - Fixed formatting, enabled modules and security issues