Fix IP duplication + graphical stuff