Mostly addition of comments; restructuring of Scheme to make more sense and be more extensible