reorganize some code; refactor Assembly version code; clean up and comment areas;