fixes after messing up and changing the programming style to library like