some minor updates
replaced moment with tempus