Add propagation of 'ENTRY' lines in memory map
Clean up main() a little