raw2day fixes and cleanup