clean up, add some content on aes & geoms