made a few changes
a satisfying commit