minor updates, fixes, and todos