LS update, fixes, fixes and fixes