more update with bug fixes