references + fixes