more fixes
many new updates, including core data