fixed all crap; added necessary outputs