resolved issues in the implementation - bug fixes