fixed various items on the bug list
fixed merge conflicts