cluster changes
lots of mem fix issues
lot of mem fix