* Fix debug build * getDemoIDData matched, fix up various inlines and template classes * Remove nonmatching comments