moved inc_num to a better place, cleaned up alias generation a bit,