Rule Sorting and Small Fixes