add info and fix some issues