design, fixed some stuff