fixes done, still need to check over