bug fixes, cleanup, interface, kitchen sink