fixing many bugs when using with scenic2