Some fixes, but it segfaults in the :(