Sorted some 'bugs'