allow and diasslow lib rules fix, small cleanups