Address first round of comments from Mistobaan