components added, bug fixed, now clean output