Fixed some listeners and commands.