Merge
Fixed minor  bugs.