Added many more checks n stuff

n derps.