Fixes #21 - segmentation fault due to which.c, also cleaned up functional hackery