Made the extra weight on units described in bug #296 go to ruleset

Fix some inconsistent indents and comment style also