- Many optimization fixes, removed threesome from network