further merging changes + bugfixes
merger
time constrained bad fixes for bad bugs