build + load improvements