Update for Mono, last update before overhaul

Signed-off-by: Rick Kerkhof <rick.2889@gmail.com>