Tidying, added some docs & useful prints