Some comments and tweaks