A little cleanup, bugs remaining