Small adds (15/24)

Small adds