minor bug fixes also in Christmas time!