got working on ubuntu, much faster all around. fixes #6