added default return values to a few functions