Fixed review comments filed by Joris; mostly added comments