Made more polish and optimizations
Added SWC