Think I fixed/added stuff