fix some coding standards; fix security standards, fix structure