small fixes and adjustemnts