design/bug fixes