Fixed a few things, not sure how will work