Removed massive structures (we can readd them in the future if we wish).  A few small fixes here and there.