Misc. fixes. IC2 still doesn't work