fixed more time issues