add more information and clean up a bit