info added
errors improved