Some small changes made and new features added.