Minor tweaks and corrections based on Tobias's comments