bugs almost all kinked out!