modify rules a bit and fix another stupid bug

just to make updates more fluid