More big fixes, especially with a float problem