Tried to fix a few thigns