a few updates and modernizations