Fixing Insec and lots of shit