School Fixes & SP Fixes