Some bug fixes and code cleaning