Better printing, fixed a bug with insertion, naming changes