more fixes/cleanup