more progress/tweaks