cleanup, bugs