New rules (fixes #4 #15 #16 #17 #18)

fixes #4
fixes #15 
fixes #16 
fixes #17 
fixes #18