- Minor bug fixes and code cleaning.