Added a comment & fixed a small bug & changed an error-message