a few fixses