bug fix

just some bug fixes.

because of some force closes... 

thanks