more ::i bug fixes