small fixes and last success message presence validaction