Fixed some errors - still need to check 56