Fixed starred sorting and some time enhancements