FIXED BUGS fixed journal bug and add order by to order