more bug fixes.
small fixes