tweaks, and multiple keys per action
mark stuff thats been done
TODOS and comment tweaks and stuff