some Neil bugs fixed