logging updates and additional checks