Added a couple extensions for either (IRTO). Fixed minor bugs.