Expanded laws
Fix some bugs from last night
Merge pull request #1 from palfvin/palfvin_wed_night

Expanded laws