Cleanup code and added in lots of sprites