BUG: fixed bugs, removed some temporary cells