Improves docs, error messages