Add Boos + other edits