few more bug fixes.