Much update many features and fixxes