efficieny, cleanup, bugs