Fixing some stuff slowly.