Refactor savefile load

and address race condition in bitmap reference