Fixed some broken commands, time helpers, private modules