SWC files links and code tidied

Currently getting errors