slightly better errors
loose ends