Queue events for attach and detach, clean up fps lock, clean TODO