Finish return types
Fix mark handling in ##wr