Making it work with mouse and button controls
Fixed the concurrent modification exceptions