Some changes to squik mostly