Some fixes some breaks....