Fixes #18, #19, #20 loading bugs.