Loading bug fixes
- Fixed concatenation error
- Added TODO about lazy first