Finally got nullstream working properly

Also, cleaned up makefile some.