"return, function fixes"