Rules added to core, and some small fixes