more address rearrangements and experiments

Signed-off-by: dvorkinista <villain@noironetworks.com>