Some bug fixes and started report