added new classes (not implemented)
Clean
fixed few problems