minor changes/hacks