fixed codemap and some more renaming
better presentation in scratch space