Fixed various problems with solution comments
Fixed some problems with blocking deadlines, some still remain.