[DONTNEED] lots of comments, old code. Fixed up some additional code, did general cleanup (renamed one or two things)