more prettification and added some missing points