cluster stuff, fix bugs