changes

many changes due to a problem with ruby mine commit