master sln and fixing refs