Fix usrmsg and action + general cleanup.