Cleaned up and removed unnecessary parts, also some fixes