added various stuff
added pretty