A bit more cleaning and commenting, tons of print statements to see what...

... is happening