fixes for play
Merge branch 'master' of feiwong.github.com:FeiWongReed/fw-overlay