Changes from last meeting plus minor updates to make compile
Added RGB channels to color in surface format function