references fixed once and for all...