removed some debug values
fixed js-boeppels
fixed conflicts