Fixed a few things. Broke notification buttons though.
Have to manually uninstall before new intent ID's work, it was catching the old ones in the Intent.