Enable debugging in exp hive
Solve prefix matching issues in 9.0, fix some Serjic's code
Reformat, fixes, cleanup