Fixed bugs
https://docs.google.com/spreadsheet/ccc?key=0Ao66U3spcjGSdGtuSGZOZFRpSGU5Sk02azlVYnlrbVE#gid=0
[JP] - 8/5/2013