Now works with two frames, other misc fixes