Several improvements in the wave notebook