Some updates

Still have FGV/DVR and OO to update