Fixed problems with fluffs

http://manage.dimagi.com/default.asp?134522
http://manage.dimagi.com/default.asp?134530
http://manage.dimagi.com/default.asp?134531
http://manage.dimagi.com/default.asp?134533
@czue You're right. I updated PR.