fixed some stuff
still a work in progress
outputs