some format changes
added some issues