revert
fixed msgsrc
fixed issues