Some missing files plus a fix, deleted a redundant file