Updated documentation, logging and checks