refactoring, fix pregweek/day function, message prefix fix