Clan reprogramming + bug fixxes