fixes to elandbangcore and more