Better error handling, added help