Fixed formatting of headers, added more module types