Minor changes
There is a bug with show