fixes for more implementation and crashes.