Introduced jpararw and cleaned up