Added more info, fixed alignment, etc.