Commit of fixes done together. My fixes of today are marked with _DANIEL.
drwxr-xr-x - ir