minor tweaks (getting ready for mongodb)