Fixed segfaults, expanded init/create