Some bug fixes and debugging