fix a few things from feedback