updated a few files, things still need work