Made more progress fixing slot issues.