Fix minor tweaks, will go full tweaking later