Changes from juberti review; tweaks to comments