removed rvm + bugfixes