cleanup, more fixes