Starts fixing Apr.10/2014 Remarks

This commit is related to Apr.10/2014 Remarks. They are almost fully
fixed.