Cleaup + fixed that a .init() call could sometimes do weird things.