updates to scanner and additional features implemented in server