- more minor bug fixes