updates

some issues fixed