fixed some stuff.... still a loooooong way to go