initialization fix and internal updates