fixed storage layout and loader generation