last changes with editing
merged with rbuletc
some small changes
merge