updates to combine scanner and server with logging