App validator + numerous fixes