Update comments, database entries, modules #2