Merge
Fixed some stupid stuff