more bug fixes
..