Switched blocks around, fixed bugs.