insight corrections and some bug correction