Fixes and sort bu time