reorganize some code; refactor Assembly version code; clean up and comme...

...nt areas;