Fixed some key bugs. Some things still do not quite work. Will work on them Friday at office hours.