Extras added to intent via Bundle now

Changed extras to be added via Bundle, and did better checking for
String and Boolean extras.