Fixed, fixed, fixed, added..

Fixed error messages (else, if statements etc.) 
Added messages.