Next merging. Some bug fixing.