New functions, some fixes,...