bug fixes, testing, code adjustments, restructuring