Finished IdentifiierMap

And a few other minor fixes, to update to current situation.