refractored char tables
changed models and associations