Everything seems to be working on my end, but further testing is required. I also added static typing to some dictionaries.
