Fixes for All Problems Found In Class