Small fixes/more comments