Some Cleanup

Need to update a lot of this...will do this week.