Docs + better checks