made a few changes, need to motivate myself more