Track more stuff

Signed-off-by: iceandfire <arhamjamal@gmail.com>
Other misc stuff from CM

Signed-off-by: iceandfire <arhamjamal@gmail.com>