sooo many little fixes etc.