Fix some indentation; add dependencies