Merging + fixing memory bugs