Change spawn methods, add points accounting