0.5a: further revisions to merged ways, API->SWF error handling