Fixes...

Refactored identificationColumn fallback
Code cleanup

Please let us do a feature freeze now.