Clean up
Added object load handling
Handle block tiles