fixing things up a little more... almost done