Fixed the difficulties
Fixed some stuff
Fixed the unslovable problem
Merge remote-tracking branch 'origin/Tom'