Worked more on commands, fixed listeners