fixed reload issue and added messages