Fixed blitting problems
Trying to merge blitting modifications, but structural changes are causing problems