fixed some drawing order issues and animation stuff