bug fixes, fixed some of the mystery disappearing trick