cleaning up design, adding some stuff