Removed genmsg-in-package, changed force-genmsg to genmsg, fixed bugs