cleaned up a lot fostuff