minor changes and a dependency addition that will have to be removed later