Made source listings prettier
Fixed figure numbering