Initial code changes for version 2.02 which aims to address certain bugs.