improved structure of maybe, and tweaked ls-files