Add some bug fixes and a random hide time