Last update with minor fixes