Minor feature addition and bug fixes.