I think they were the only methods that I added/changed.

I will have a closer look at the alpha channel problem.