more debugging, merging
resolving runtime errors
Fish creation bugs