Tweaks, improvements, and additional tasks