adding last features for #117, everything should be done now except remaining about popup box link target