added diskusage support and better error handling