Cleaned up code, as well as refined BSPSpill to match KDSpill