updated rulesfile and updated to new stava version