some errors
not done
"Merge latest 2014.05.19"