Improved input target sites validation; other minor fixes.