Actually fixed some things... ***