minor modifications and tweaks