Cleanedup code and adjusted pictures.