Subjects, Pooling, bux fixes, cleanup, refactor,