decent error message
decent error message #2
small but important fixes
another important fix