Updated/added some stuff while working on LINX.