Fixed stuff with new assets and cleaned up