- Small fixes, still need to fix the SIGSEGV.