Massive performance improvements, fixes #10