merged branches and fixed filesystem again.