Few bug fixes. This is looking good.