A few updates and clean up