moving a lot of stuff around, fixing alpha, etc