modifications and fixes for raw's