A few updates and additions