fixed language rake
more
update to master
concluding merger