remove the add hoc parse_top..
rename internal_entry into entry and some cleans
simplify even more