So I upgraded to whole gun and fixed some arc bugs here the newest screenshot: