more fixes.  should mostly be working now.