Completed And fixed bugs