fixed package coupling issue
fixed some issues