clean errors
first design
fixed errors