estimation improvements
yMerge branch 'master' of gh:creatdenoi/homefile