simplify availability validation + minor changes