batch update; still in pre-alpha stages; more comments; reorganization of code