Added return to non-void function.
Added return to non-void function.
Added return values for non-void functions.
Fixed return types.