Fixes and new clustering