otw - Trying to fix the block position and missing name errors.
otw - Merged Melissa's latest changes.
otw - Made a few fixes to help with planning.
merged in master branch.