Small bug fixes, scanner now running