Background task work
Further little fixes/tweaks