Fixed a lotta things