Completed Merge and Minor fixes