Add 2 more weapon profiles, formatting cleanup, add some default values

Add 2 more weapon profiles, formatting cleanup, add some default values