Fixing bugs and merging.