Fixed error-messages & unnecessary content