minor bug, minor progress