Minor improvements
Improved Justifiers