Small design fixes + Improved disk space counting