SystemJS fixes

This is now all working for me. If there is anything else just let me know.