fixes and redesign