more fixes, and stuff.