#2 master - fix ForeignIDs + update javadoc