small cleanup and some progress on jammit rules