Fixed click outside play area crash bug and some house keeping